From 8ac2b1dda638008b9f71de224e28f2b01cfdd91c Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 24 Jan 1999 23:07:33 +0000 Subject: [PATCH] Byteswap Sun Jan 24 18:09:24 1999 Owen Taylor * gdk/gdkdnd.c (motif_read_initiator_info): Byteswap --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/gdkdnd.c | 10 +++++----- gdk/x11/gdkdnd-x11.c | 10 +++++----- 9 files changed, 45 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25ca0edbe6..b6470b3e96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jan 24 18:09:24 1999 Owen Taylor + + * gdk/gdkdnd.c (motif_read_initiator_info): Byteswap + the MotifInitiatorInfo structure _before_ using it. + Sun Jan 24 12:17:39 1999 Owen Taylor * gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 25ca0edbe6..b6470b3e96 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sun Jan 24 18:09:24 1999 Owen Taylor + + * gdk/gdkdnd.c (motif_read_initiator_info): Byteswap + the MotifInitiatorInfo structure _before_ using it. + Sun Jan 24 12:17:39 1999 Owen Taylor * gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 25ca0edbe6..b6470b3e96 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Jan 24 18:09:24 1999 Owen Taylor + + * gdk/gdkdnd.c (motif_read_initiator_info): Byteswap + the MotifInitiatorInfo structure _before_ using it. + Sun Jan 24 12:17:39 1999 Owen Taylor * gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 25ca0edbe6..b6470b3e96 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sun Jan 24 18:09:24 1999 Owen Taylor + + * gdk/gdkdnd.c (motif_read_initiator_info): Byteswap + the MotifInitiatorInfo structure _before_ using it. + Sun Jan 24 12:17:39 1999 Owen Taylor * gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 25ca0edbe6..b6470b3e96 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Jan 24 18:09:24 1999 Owen Taylor + + * gdk/gdkdnd.c (motif_read_initiator_info): Byteswap + the MotifInitiatorInfo structure _before_ using it. + Sun Jan 24 12:17:39 1999 Owen Taylor * gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 25ca0edbe6..b6470b3e96 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Jan 24 18:09:24 1999 Owen Taylor + + * gdk/gdkdnd.c (motif_read_initiator_info): Byteswap + the MotifInitiatorInfo structure _before_ using it. + Sun Jan 24 12:17:39 1999 Owen Taylor * gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 25ca0edbe6..b6470b3e96 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Jan 24 18:09:24 1999 Owen Taylor + + * gdk/gdkdnd.c (motif_read_initiator_info): Byteswap + the MotifInitiatorInfo structure _before_ using it. + Sun Jan 24 12:17:39 1999 Owen Taylor * gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c index c8a164afaa..7c951e9869 100644 --- a/gdk/gdkdnd.c +++ b/gdk/gdkdnd.c @@ -1451,6 +1451,11 @@ motif_read_initiator_info (Window source_window, motif_read_target_table (); + initiator_info->targets_index = + card16_to_host (initiator_info->targets_index, initiator_info->byte_order); + initiator_info->selection_atom = + card32_to_host (initiator_info->selection_atom, initiator_info->byte_order); + if (initiator_info->targets_index >= motif_n_target_lists) { g_warning ("Invalid target index in TOP_LEVEL_ENTER MESSAGE"); @@ -1458,11 +1463,6 @@ motif_read_initiator_info (Window source_window, return GDK_FILTER_REMOVE; } - initiator_info->targets_index = - card16_to_host (initiator_info->targets_index, initiator_info->byte_order); - initiator_info->selection_atom = - card32_to_host (initiator_info->selection_atom, initiator_info->byte_order); - tmp_list = g_list_last (motif_target_lists[initiator_info->targets_index]); *targets = NULL; diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index c8a164afaa..7c951e9869 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -1451,6 +1451,11 @@ motif_read_initiator_info (Window source_window, motif_read_target_table (); + initiator_info->targets_index = + card16_to_host (initiator_info->targets_index, initiator_info->byte_order); + initiator_info->selection_atom = + card32_to_host (initiator_info->selection_atom, initiator_info->byte_order); + if (initiator_info->targets_index >= motif_n_target_lists) { g_warning ("Invalid target index in TOP_LEVEL_ENTER MESSAGE"); @@ -1458,11 +1463,6 @@ motif_read_initiator_info (Window source_window, return GDK_FILTER_REMOVE; } - initiator_info->targets_index = - card16_to_host (initiator_info->targets_index, initiator_info->byte_order); - initiator_info->selection_atom = - card32_to_host (initiator_info->selection_atom, initiator_info->byte_order); - tmp_list = g_list_last (motif_target_lists[initiator_info->targets_index]); *targets = NULL; -- 2.30.2